79. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:33 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

79.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/Model/SearchFilterGroupBuilder.php2018-10-10 20:33:20 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/Model/SearchFilterGroupBuilder.php2020-06-26 11:11:14 +0000

79.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7188
Changed622
Inserted00
Removed00

79.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

79.4 Active regular expressions

No regular expressions were active.

79.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_LayeredNavigation 17  * @package     Mageplaza_LayeredNavigation
18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21  21 
22 namespace Mageplaza\LayeredNavigation\Model\Search; 22 namespace Mageplaza\LayeredNavigation\Model\Search;
23  23 
24 use Magento\Framework\Api\FilterBuilder; 24 use Magento\Framework\Api\FilterBuilder;
25 use Magento\Framework\Api\ObjectFactory; 25 use Magento\Framework\Api\ObjectFactory;
26 use Magento\Framework\Api\Search\FilterGroup; 26 use Magento\Framework\Api\Search\FilterGroup;
27 use Magento\Framework\Api\Search\FilterGroupBuilder as SourceFilterGroupBuilder; 27 use Magento\Framework\Api\Search\FilterGroupBuilder as SourceFilterGroupBuilder;
28 use Magento\Framework\App\RequestInterface; 28 use Magento\Framework\App\RequestInterface;
29  29 
30 /** 30 /**
31  * Builder for FilterGroup Data. 31  * Builder for FilterGroup Data.
32  */ 32  */
33 class FilterGroupBuilder extends SourceFilterGroupBuilder 33 class FilterGroupBuilder extends SourceFilterGroupBuilder
34 { 34 {
35     /** @var \Magento\Framework\App\RequestInterface */ 35     /** @var 
RequestInterface */
36     protected $_request; 36     protected $_request;
37  37 
38     /** 38     /**
39      * FilterGroupBuilder constructor. 39      * FilterGroupBuilder constructor.
40      * @param \Magento\Framework\Api\ObjectFactory $objectFactory 40      *
41      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder 41      * @param 
ObjectFactory $objectFactory
42      * @param \Magento\Framework\App\RequestInterface $request 42      * @param 
FilterBuilder $filterBuilder
    43      * @param 
RequestInterface $request
43      */ 44      */
44     public function __construct( 45     public function __construct(
45         ObjectFactory $objectFactory, 46         ObjectFactory $objectFactory,
46         FilterBuilder $filterBuilder, 47         FilterBuilder $filterBuilder,
47         RequestInterface $request 48         RequestInterface $request
48     )
 49     ) {
49     {    
50         $this->_request = $request; 50         $this->_request = $request;
51  51 
52         parent::__construct($objectFactory, $filterBuilder); 52         parent::__construct($objectFactory, $filterBuilder);
53     } 53     }
54  54 
55     /** 55     /**
56      * @return FilterGroupBuilder 56      * @return FilterGroupBuilder
57      */ 57      */
58     public function cloneObject() 58     public function cloneObject()
59     { 59     {
60         $cloneObject = clone $this; 60         $cloneObject = clone $this;
61         $cloneObject->setFilterBuilder(clone $this->_filterBuilder); 61         $cloneObject->setFilterBuilder(clone $this->_filterBuilder);
62  62 
63         return $cloneObject; 63         return $cloneObject;
64     } 64     }
65  65 
66     /** 66     /**
67      * @param $filterBuilder 67      * @param $filterBuilder
68      */ 68      */
69     public function setFilterBuilder($filterBuilder) 69     public function setFilterBuilder($filterBuilder)
70     { 70     {
71         $this->_filterBuilder = $filterBuilder; 71         $this->_filterBuilder = $filterBuilder;
72     } 72     }
73  73 
74     /** 74     /**
75      * @param $attributeCode 75      * @param $attributeCode
76      * 76      *
77      * @return $this 77      * @return $this
78      */ 78      */
79     public function removeFilter($attributeCode) 79     public function removeFilter($attributeCode)
80     { 80     {
81         if (isset($this->data[FilterGroup::FILTERS])
) {		 81         if (isset($this->data[FilterGroup::FILTERS]) && is_array($this->data[FilterGroup::FILTERS])) {
82             foreach ($this->data[FilterGroup::FILTERS] as $key => $filter) { 82             foreach ($this->data[FilterGroup::FILTERS] as $key => $filter) {
83                 if ($filter->getField() ==
 $attributeCode) {		 83                 if ($filter->getField() === $attributeCode) {
84                     if (($attributeCode == 'category_ids') && ($filter->getValue() ==
 $this->_request->getParam('id'))) {		 84                     if ($attributeCode === 'category_ids'
    85                         
&& ($filter->getValue() === $this->_request->getParam('id'))
    86                     ) {
85                         continue; 87                         continue;
86                     } 88                     }
87                     unset($this->data[FilterGroup::FILTERS][$key]); 89                     unset($this->data[FilterGroup::FILTERS][$key]);
88                 } 90                 }
89             } 91             }
90         } 92         }
91  93 
92         return $this; 94         return $this;
93     } 95     }
94  96 
95     /** 97     /**
96      * Return the Data type class name 98      * Return the Data type class name
97      * 99      *
98      * @return string 100      * @return string
99      */ 101      */
100     protected function _getDataObjectType() 102     protected function _getDataObjectType()
101     { 103     {
102         return 'Magento\Framework\Api\Search\FilterGroup'; 104         return 
FilterGroup::class;
103     } 105     }
104 } 106 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.